Merged
Conversation
purple4reina
approved these changes
Jan 30, 2026
purple4reina
reviewed
Feb 2, 2026
| run: | | ||
| echo "Patching pyproject.toml to use latest build of dd-trace-py" | ||
| sed -i 's|^ddtrace =.*$|ddtrace = { file = "${{ steps.find-ddtrace-wheel.outputs.wheel_path }}" }|' pyproject.toml | ||
| sed -zEi 's|^ddtrace =.*$|ddtrace = { file = "${{ steps.find-ddtrace-wheel.outputs.wheel_path }}" }|' pyproject.toml |
Contributor
There was a problem hiding this comment.
Just curious, what does this change do?
Contributor
Author
There was a problem hiding this comment.
The workflow for the system-tests previously assumed that the ddtrace dependency definition would be on one line and this resulted in all of the Github actions (but not local or Gitlab) build layer jobs failing. This flag allows the more complex definition. @florentinl
purple4reina
approved these changes
Feb 2, 2026
taegyunkim
reviewed
Feb 3, 2026
| wrapt = "^1.11.2" | ||
| ddtrace = ">=3.19.1,<4" | ||
| ddtrace = [ | ||
| {version = ">=3.19.1,<4", python = ">=3.8,<3.10"}, |
Contributor
There was a problem hiding this comment.
I believe this syntax is poetry specific and invalid for pip's TOML parser causing build failures in
https://gitlab.ddbuild.io/DataDog/serverless-tools/-/jobs/1395912909
and https://github.com/DataDog/dd-trace-py/actions/runs/21604577086/job/62290700940?pr=16313
rithikanarayan
added a commit
that referenced
this pull request
Feb 3, 2026
This reverts commit aee6842.
rithikanarayan
added a commit
that referenced
this pull request
Feb 3, 2026
11 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Dedups the poetry and project sections of the pyproject.toml file.
Motivation
Fixing dependency management of ddtrace version based on Python runtime in the PyPI wheel. Response to #713
Testing Guidelines
CI. Made a sample python package with the new format of the pyproject.toml file and uploaded it to the test PyPI website. Made sure that differentp Python runtimes depend on different versions of ddtrace and that Python 3.10+ users can customize which version of ddtrace 4.X they want to use.
Additional Notes
Types of Changes
Check all that apply